]> dgit.raspbian.org Git - nextcloud-desktop.git/commitdiff
projects / nextcloud-desktop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2badd54 90bcf65)
Merge pull request #7639 from nextcloud/bugfix/conflict
authorMatthieu Gallien <matthieu.gallien@nextcloud.com>
Thu, 12 Dec 2024 10:44:39 +0000 (11:44 +0100)
committerGitHub <noreply@github.com>
Thu, 12 Dec 2024 10:44:39 +0000 (11:44 +0100)
Include folders when displaying the local metadata about a conflict.


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.